testsuite/css: Add common_cflags to build

And fix all the errors coming from that.

diff --git a/testsuite/css/change/meson.build b/testsuite/css/change/meson.build
index 3637a244a8f19759565c1013987aa529c0ef7e71..5398e5da443c80ea3f828f4bbcb36b35943cca1c 100644 (file)
--- a/testsuite/css/change/meson.build
+++ b/testsuite/css/change/meson.build
@@ -4,6 +4,7 @@ testdatadir = join_paths(installed_test_datadir, 'css')
 test_change = executable(
   'test-css-change',
   'test-css-change.c',
+  c_args: common_cflags,
   dependencies: libgtk_dep,
   install: get_option('install-tests'),
   install_dir: testexecdir,

diff --git a/testsuite/css/change/test-css-change.c b/testsuite/css/change/test-css-change.c
index add2227f65595a10276c52a6929866185b63cf1f..830f53fbfd720709505a4821e4ddc71d4f6b0886 100644 (file)
--- a/testsuite/css/change/test-css-change.c
+++ b/testsuite/css/change/test-css-change.c
@@ -29,7 +29,7 @@
 /* There shall be no other styles */
 #define GTK_STYLE_PROVIDER_PRIORITY_FORCE G_MAXUINT
 
-char *
+static char *
 test_get_other_file (const char *ui_file, const char *extension)
 {
   GString *file = g_string_new (NULL);

diff --git a/testsuite/css/meson.build b/testsuite/css/meson.build
index 237f4732d26a9d32e23c656923ba249f14a12a30..43f7a100d01a1713fa51a6c111c4205d7a843c59 100644 (file)
--- a/testsuite/css/meson.build
+++ b/testsuite/css/meson.build
@@ -7,6 +7,7 @@ testexecdir = join_paths(installed_test_bindir, 'css')
 testdatadir = join_paths(installed_test_datadir, 'css')
 
 test_api = executable('api', 'api.c',
+                      c_args: common_cflags,
                       dependencies: libgtk_dep,
                       install: get_option('install-tests'),
                       install_dir: testexecdir)
@@ -23,6 +24,7 @@ test('api', test_api,
      suite: 'css')
 
 test_data = executable('data', ['data.c', '../../gtk/css/gtkcssdataurl.c'],
+                       c_args: common_cflags,
                        include_directories: [confinc, ],
                        dependencies: gtk_deps,
                        install: get_option('install-tests'),

diff --git a/testsuite/css/nodes/meson.build b/testsuite/css/nodes/meson.build
index 42e7b215dc64341f95945febcd758bdc10d6083e..264ff588478649dc4f8bfae2bd910c543c5917de 100644 (file)
--- a/testsuite/css/nodes/meson.build
+++ b/testsuite/css/nodes/meson.build
@@ -2,6 +2,7 @@ testexecdir = join_paths(installed_test_bindir, 'css', 'nodes')
 testdatadir = join_paths(installed_test_datadir, 'css')
 
 test_nodes = executable('test-css-nodes', 'test-css-nodes.c',
+                        c_args: common_cflags,
                         install: get_option('install-tests'),
                         install_dir: testexecdir,
                         dependencies: libgtk_dep)

diff --git a/testsuite/css/parser/meson.build b/testsuite/css/parser/meson.build
index 9e501a0bd275b20492cd77a153843af6b21238eb..ea4b815a591d40e24760e6f1add9af7a39c81797 100644 (file)
--- a/testsuite/css/parser/meson.build
+++ b/testsuite/css/parser/meson.build
@@ -2,6 +2,7 @@ testexecdir = join_paths(installed_test_bindir, 'css', 'parser')
 testdatadir = join_paths(installed_test_datadir, 'css')
 
 test_parser = executable('test-css-parser', 'test-css-parser.c',
+                         c_args: common_cflags,
                          install: get_option('install-tests'),
                          install_dir: testexecdir,
                          dependencies: libgtk_dep)

diff --git a/testsuite/css/style/meson.build b/testsuite/css/style/meson.build
index 4f4921e9461a160a3fc5cf4a4482b8292f03dcd6..efc635b44a45f2531cb0338077b1532537c5126b 100644 (file)
--- a/testsuite/css/style/meson.build
+++ b/testsuite/css/style/meson.build
@@ -11,6 +11,7 @@ test_style = executable(
   'test-css-style',
   'test-css-style.c',
   cssresources,
+  c_args: common_cflags,
   dependencies: libgtk_dep,
   install: get_option('install-tests'),
   install_dir: testexecdir,

diff --git a/testsuite/css/style/test-css-style.c b/testsuite/css/style/test-css-style.c
index 6e6a59466e147ec8577bea080dc85c292c669866..5c40c5cdacce77f2e3c70bd376a8bf34f90ba4d8 100644 (file)
--- a/testsuite/css/style/test-css-style.c
+++ b/testsuite/css/style/test-css-style.c
@@ -29,7 +29,7 @@
 /* There shall be no other styles */
 #define GTK_STYLE_PROVIDER_PRIORITY_FORCE G_MAXUINT
 
-char *
+static char *
 test_get_other_file (const char *ui_file, const char *extension)
 {
   GString *file = g_string_new (NULL);